From 998479ef8f373c9206915b9e0bd4e7dbc942a790 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 23 Nov 2009 07:10:56 +0000 Subject: [PATCH] Remus: remove Py_RETURN_NONE for Python 2.3 Signed-off-by: KUWAMURA Shin'ya --- tools/python/xen/lowlevel/checkpoint/checkpoint.c | 9 ++++++--- tools/python/xen/lowlevel/netlink/netlink.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tools/python/xen/lowlevel/checkpoint/checkpoint.c b/tools/python/xen/lowlevel/checkpoint/checkpoint.c index bdd82be180..7545d7deb6 100644 --- a/tools/python/xen/lowlevel/checkpoint/checkpoint.c +++ b/tools/python/xen/lowlevel/checkpoint/checkpoint.c @@ -72,7 +72,8 @@ static PyObject* pycheckpoint_open(PyObject* obj, PyObject* args) return NULL; } - Py_RETURN_NONE; + Py_INCREF(Py_None); + return Py_None; } static PyObject* pycheckpoint_close(PyObject* obj, PyObject* args) @@ -88,7 +89,8 @@ static PyObject* pycheckpoint_close(PyObject* obj, PyObject* args) Py_XDECREF(self->checkpoint_cb); self->checkpoint_cb = NULL; - Py_RETURN_NONE; + Py_INCREF(Py_None); + return Py_None; } static PyObject* pycheckpoint_start(PyObject* obj, PyObject* args) { @@ -163,7 +165,8 @@ static PyObject* pycheckpoint_start(PyObject* obj, PyObject* args) { goto err; } - Py_RETURN_NONE; + Py_INCREF(Py_None); + return Py_None; err: self->suspend_cb = NULL; diff --git a/tools/python/xen/lowlevel/netlink/netlink.c b/tools/python/xen/lowlevel/netlink/netlink.c index e5cfb3edf1..c48b8e4990 100644 --- a/tools/python/xen/lowlevel/netlink/netlink.c +++ b/tools/python/xen/lowlevel/netlink/netlink.c @@ -55,7 +55,8 @@ static PyObject* pyrtnl_talk(PyObject* obj, PyObject* args) return NULL; } - Py_RETURN_NONE; + Py_INCREF(Py_None); + return Py_None; } static PyObject* pyrtnl_wilddump_request(PyObject* obj, PyObject* args) @@ -71,7 +72,8 @@ static PyObject* pyrtnl_wilddump_request(PyObject* obj, PyObject* args) return NULL; } - Py_RETURN_NONE; + Py_INCREF(Py_None); + return Py_None; } static PyObject* pyrtnl_dump_request(PyObject* obj, PyObject* args) @@ -89,7 +91,8 @@ static PyObject* pyrtnl_dump_request(PyObject* obj, PyObject* args) return NULL; } - Py_RETURN_NONE; + Py_INCREF(Py_None); + return Py_None; } /* translate args to python and call python callback */ @@ -133,7 +136,8 @@ static PyObject* pyrtnl_dump_filter(PyObject* obj, PyObject* args) } Py_DECREF(filter); - Py_RETURN_NONE; + Py_INCREF(Py_None); + return Py_None; } static PyMethodDef PyRtnl_methods[] = { -- 2.30.2